// The Vue build version to load with the `import` command
<<<<<<< HEAD
// 这里是整个项目的入口文件(runtime-only or standalone) has been set in webpack.base.conf with an alias.
import Vue from 'vue'
import App from './App'
import router from './router'
import './assets/styles/reset.css'//
// 这里的reset.css是指因为每个移动端的css样式都不相同 所以我们在正式开发以前我们需要先重置所有css样式
import './assets/styles/border.css'
// 接下来我们为了解决一像素边框问题我们引入另一个文件border.css
Vue.config.productionTip = false

/* eslint-disable no-new */

new Vue({
  el: '#app',
  router,

=======
// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
import Vue from 'vue'
import App from './App'
import router from './router'

Vue.config.productionTip = false

/* eslint-disable no-new */
new Vue({
  el: '#app',
  router,
>>>>>>> 5dcbcbdf2abecee74ed31cab0973e20a42d220a9
  components: { App },
  template: '<App/>'
})
